tmem: Use of 'new' clashes with C++ reserved namespace.

Rename to 'creat', which does not conflict.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c
index 019050cb974303e4762b4f9e11d9e97cd6649eb6..d24917a084b8ffb05068a15d9c14f0a5893b7c1f 100644 (file)
--- a/tools/libxc/xc_tmem.c
+++ b/tools/libxc/xc_tmem.c
@@ -187,10 +187,10 @@ int xc_tmem_auth(xc_interface *xch,
 
     op.cmd = TMEM_AUTH;
     op.pool_id = 0;
-    op.u.new.arg1 = cli_id;
-    op.u.new.flags = arg1;
-    if ( xc_tmem_uuid_parse(uuid_str, &op.u.new.uuid[0],
-                                      &op.u.new.uuid[1]) < 0 )
+    op.u.creat.arg1 = cli_id;
+    op.u.creat.flags = arg1;
+    if ( xc_tmem_uuid_parse(uuid_str, &op.u.creat.uuid[0],
+                                      &op.u.creat.uuid[1]) < 0 )
     {
         PERROR("Can't parse uuid, use xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
         return -1;
@@ -380,10 +380,10 @@ static int xc_tmem_restore_new_pool(
 
     op.cmd = TMEM_RESTORE_NEW;
     op.pool_id = pool_id;
-    op.u.new.arg1 = cli_id;
-    op.u.new.flags = flags;
-    op.u.new.uuid[0] = uuid_lo;
-    op.u.new.uuid[1] = uuid_hi;
+    op.u.creat.arg1 = cli_id;
+    op.u.creat.flags = flags;
+    op.u.creat.uuid[0] = uuid_lo;
+    op.u.creat.uuid[1] = uuid_hi;
 
     return do_tmem_op(xch, &op);
 }

diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index 5a7de5c5230b08cac38f01c5597a321ebdbd4de2..6aed0a59081f3e2fb90346dadaf43678547abd08 100644 (file)
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -2669,14 +2669,14 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops)
     } else if ( op.cmd == TMEM_AUTH ) {
         tmem_write_lock(&tmem_rwlock);
         tmem_write_lock_set = 1;
-        rc = tmemc_shared_pool_auth(op.u.new.arg1,op.u.new.uuid[0],
-                         op.u.new.uuid[1],op.u.new.flags);
+        rc = tmemc_shared_pool_auth(op.u.creat.arg1,op.u.creat.uuid[0],
+                         op.u.creat.uuid[1],op.u.creat.flags);
         goto out;
     } else if ( op.cmd == TMEM_RESTORE_NEW ) {
         tmem_write_lock(&tmem_rwlock);
         tmem_write_lock_set = 1;
-        rc = do_tmem_new_pool(op.u.new.arg1, op.pool_id, op.u.new.flags,
-                         op.u.new.uuid[0], op.u.new.uuid[1]);
+        rc = do_tmem_new_pool(op.u.creat.arg1, op.pool_id, op.u.creat.flags,
+                         op.u.creat.uuid[0], op.u.creat.uuid[1]);
         goto out;
     }
 
@@ -2722,8 +2722,8 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops)
     switch ( op.cmd )
     {
     case TMEM_NEW_POOL:
-        rc = do_tmem_new_pool(CLI_ID_NULL, 0, op.u.new.flags,
-                              op.u.new.uuid[0], op.u.new.uuid[1]);
+        rc = do_tmem_new_pool(CLI_ID_NULL, 0, op.u.creat.flags,
+                              op.u.creat.uuid[0], op.u.creat.uuid[1]);
         break;
     case TMEM_NEW_PAGE:
         tmem_ensure_avail_pages();

diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h
index d1889c7baefb0ec1792c1a412687419de2e3b2d4..74bd1c65a03382f484bfeb1450032d42d8229ce9 100644 (file)
--- a/xen/include/public/tmem.h
+++ b/xen/include/public/tmem.h
@@ -105,7 +105,7 @@ struct tmem_op {
             uint64_t uuid[2];
             uint32_t flags;
             uint32_t arg1;
-        } new; /* for cmd == TMEM_NEW_POOL, TMEM_AUTH, TMEM_RESTORE_NEW */
+        } creat; /* for cmd == TMEM_NEW_POOL, TMEM_AUTH, TMEM_RESTORE_NEW */
         struct { 
             uint32_t subop;
             uint32_t cli_id;

diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h
index f409cbf1a9a7881f0700f88259d788bfb3959251..c126088bcaf071b9288b8fe2d3caa17760cb2006 100644 (file)
--- a/xen/include/xen/tmem_xen.h
+++ b/xen/include/xen/tmem_xen.h
@@ -469,10 +469,10 @@ static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops)
             return rc;
         switch ( cop.cmd )
         {
-        case TMEM_NEW_POOL:   u = XLAT_tmem_op_u_new;   break;
+        case TMEM_NEW_POOL:   u = XLAT_tmem_op_u_creat; break;
         case TMEM_CONTROL:    u = XLAT_tmem_op_u_ctrl;  break;
-        case TMEM_AUTH:       u = XLAT_tmem_op_u_new;   break;
-        case TMEM_RESTORE_NEW:u = XLAT_tmem_op_u_new;   break;
+        case TMEM_AUTH:       u = XLAT_tmem_op_u_creat; break;
+        case TMEM_RESTORE_NEW:u = XLAT_tmem_op_u_creat; break;
         default:              u = XLAT_tmem_op_u_gen ;  break;
         }
 #define XLAT_tmem_op_HNDL_u_ctrl_buf(_d_, _s_) \